From c45caf2a416c52281a7f338082a3febb776c11c6 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 18 Nov 2004 10:27:46 +0000 Subject: [PATCH] bitkeeper revision 1.1159.176.3 (419c7922rQh8G2esWsSBcfh7OMce6A) Foreign-page cleanups. --- linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h | 5 +---- linux-2.6.9-xen-sparse/include/linux/gfp.h | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h index 688df84eb9..d043bc491d 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h @@ -10,10 +10,7 @@ #ifndef __ASM_XEN_FOREIGN_PAGE_H__ #define __ASM_XEN_FOREIGN_PAGE_H__ -/* - * NOTE: PG_foreign must not conflict with any PG_ definition in page-flags.h!! - */ -#define PG_foreign 25 +#define PG_foreign PG_arch_1 #define PageForeign(page) test_bit(PG_foreign, &(page)->flags) diff --git a/linux-2.6.9-xen-sparse/include/linux/gfp.h b/linux-2.6.9-xen-sparse/include/linux/gfp.h index 0c7098657a..6b1642d379 100644 --- a/linux-2.6.9-xen-sparse/include/linux/gfp.h +++ b/linux-2.6.9-xen-sparse/include/linux/gfp.h @@ -79,11 +79,7 @@ struct vm_area_struct; * immediately bail: the arch-specific function has done all the work. */ #ifndef HAVE_ARCH_FREE_PAGE -static inline int arch_free_page(struct page *page, int order) -{ - /* Generic free_page must do the work. */ - return 0; -} +#define arch_free_page(page, order) 0 #endif extern struct page * -- 2.30.2